llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-08 00:50:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Deprecate the id field in group (#1987)

Browse Source
This commit is contained in:
Yaodong Yu
2023-06-18 23:33:13 +08:00
committed by GitHub
parent 3562c36817
commit d0ac265c91
10 changed files with 52 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
controllers/user.go
View File

@ -80,7 +80,7 @@ func (c *ApiController) GetGlobalUsers() {
// @router /get-users [get] // @router /get-users [get]
func (c *ApiController) GetUsers() { func (c *ApiController) GetUsers() {
owner := c.Input().Get("owner") owner := c.Input().Get("owner")
groupId := c.Input().Get("groupId") groupName := c.Input().Get("groupName")
limit := c.Input().Get("pageSize") limit := c.Input().Get("pageSize")
page := c.Input().Get("p") page := c.Input().Get("p")
field := c.Input().Get("field") field := c.Input().Get("field")
@ -89,8 +89,8 @@ func (c *ApiController) GetUsers() {
sortOrder := c.Input().Get("sortOrder") sortOrder := c.Input().Get("sortOrder")
if limit == "" || page == "" { if limit == "" || page == "" {
if groupId != "" { if groupName != "" {
maskedUsers, err := object.GetMaskedUsers(object.GetGroupUsers(groupId)) maskedUsers, err := object.GetMaskedUsers(object.GetGroupUsers(groupName))
if err != nil { if err != nil {
c.ResponseError(err.Error()) c.ResponseError(err.Error())
return return
@ -108,14 +108,14 @@ func (c *ApiController) GetUsers() {
c.ServeJSON() c.ServeJSON()
} else { } else {
limit := util.ParseInt(limit) limit := util.ParseInt(limit)
count, err := object.GetUserCount(owner, field, value, groupId) count, err := object.GetUserCount(owner, field, value, groupName)
if err != nil { if err != nil {
c.ResponseError(err.Error()) c.ResponseError(err.Error())
return return
} }
paginator := pagination.SetPaginator(c.Ctx, limit, count) paginator := pagination.SetPaginator(c.Ctx, limit, count)
users, err := object.GetPaginationUsers(owner, paginator.Offset(), limit, field, value, sortField, sortOrder, groupId) users, err := object.GetPaginationUsers(owner, paginator.Offset(), limit, field, value, sortField, sortOrder, groupName)
if err != nil { if err != nil {
c.ResponseError(err.Error()) c.ResponseError(err.Error())
return return

20
object/group.go
View File

@ -24,11 +24,10 @@ import (
type Group struct { type Group struct {
Owner string `xorm:"varchar(100) notnull pk" json:"owner"` Owner string `xorm:"varchar(100) notnull pk" json:"owner"`
Name string `xorm:"varchar(100) notnull pk unique" json:"name"` Name string `xorm:"varchar(100) notnull pk unique index" json:"name"`
CreatedTime string `xorm:"varchar(100)" json:"createdTime"` CreatedTime string `xorm:"varchar(100)" json:"createdTime"`
UpdatedTime string `xorm:"varchar(100)" json:"updatedTime"` UpdatedTime string `xorm:"varchar(100)" json:"updatedTime"`
Id string `xorm:"varchar(100) not null index" json:"id"`
DisplayName string `xorm:"varchar(100)" json:"displayName"` DisplayName string `xorm:"varchar(100)" json:"displayName"`
Manager string `xorm:"varchar(100)" json:"manager"` Manager string `xorm:"varchar(100)" json:"manager"`
ContactEmail string `xorm:"varchar(100)" json:"contactEmail"` ContactEmail string `xorm:"varchar(100)" json:"contactEmail"`
@ -95,12 +94,12 @@ func getGroup(owner string, name string) (*Group, error) {
} }
} }
func getGroupById(id string) (*Group, error) { func getGroupByName(name string) (*Group, error) {
if id == "" { if name == "" {
return nil, nil return nil, nil
} }
group := Group{Id: id} group := Group{Name: name}
existed, err := adapter.Engine.Get(&group) existed, err := adapter.Engine.Get(&group)
if err != nil { if err != nil {
return nil, err return nil, err
@ -135,10 +134,6 @@ func UpdateGroup(id string, group *Group) (bool, error) {
} }
func AddGroup(group *Group) (bool, error) { func AddGroup(group *Group) (bool, error) {
if group.Id == "" {
group.Id = util.GenerateId()
}
affected, err := adapter.Engine.Insert(group) affected, err := adapter.Engine.Insert(group)
if err != nil { if err != nil {
return false, err return false, err
@ -164,7 +159,7 @@ func DeleteGroup(group *Group) (bool, error) {
return false, err return false, err
} }
if count, err := adapter.Engine.Where("parent_id = ?", group.Id).Count(&Group{}); err != nil { if count, err := adapter.Engine.Where("parent_id = ?", group.Name).Count(&Group{}); err != nil {
return false, err return false, err
} else if count > 0 { } else if count > 0 {
return false, errors.New("group has children group") return false, errors.New("group has children group")
@ -183,7 +178,7 @@ func DeleteGroup(group *Group) (bool, error) {
return false, err return false, err
} }
if _, err := session.Delete(&UserGroupRelation{GroupId: group.Id}); err != nil { if _, err := session.Delete(&UserGroupRelation{GroupName: group.Name}); err != nil {
session.Rollback() session.Rollback()
return false, err return false, err
} }
@ -215,9 +210,8 @@ func ConvertToTreeData(groups []*Group, parentId string) []*Group {
Key: group.Name, Key: group.Name,
Type: group.Type, Type: group.Type,
Owner: group.Owner, Owner: group.Owner,
Id: group.Id,
} }
children := ConvertToTreeData(groups, group.Id) children := ConvertToTreeData(groups, group.Name)
if len(children) > 0 { if len(children) > 0 {
node.Children = children node.Children = children
} }

4
object/user.go
View File

@ -76,7 +76,6 @@ type User struct {
SignupApplication string `xorm:"varchar(100)" json:"signupApplication"` SignupApplication string `xorm:"varchar(100)" json:"signupApplication"`
Hash string `xorm:"varchar(100)" json:"hash"` Hash string `xorm:"varchar(100)" json:"hash"`
PreHash string `xorm:"varchar(100)" json:"preHash"` PreHash string `xorm:"varchar(100)" json:"preHash"`
Groups []string `xorm:"varchar(1000)" json:"groups"`
AccessKey string `xorm:"varchar(100)" json:"accessKey"` AccessKey string `xorm:"varchar(100)" json:"accessKey"`
AccessSecret string `xorm:"varchar(100)" json:"accessSecret"` AccessSecret string `xorm:"varchar(100)" json:"accessSecret"`
@ -167,6 +166,7 @@ type User struct {
Roles []*Role `json:"roles"` Roles []*Role `json:"roles"`
Permissions []*Permission `json:"permissions"` Permissions []*Permission `json:"permissions"`
Groups []string `xorm:"groups varchar(1000)" json:"groups"`
LastSigninWrongTime string `xorm:"varchar(100)" json:"lastSigninWrongTime"` LastSigninWrongTime string `xorm:"varchar(100)" json:"lastSigninWrongTime"`
SigninWrongTimes int `json:"signinWrongTimes"` SigninWrongTimes int `json:"signinWrongTimes"`
@ -725,7 +725,7 @@ func DeleteUser(user *User) (bool, error) {
return false, err return false, err
} }
affected, err = deleteRelationByUser(user.Id) affected, err = DeleteRelationByUserId(user.Id)
if err != nil { if err != nil {
return false, err return false, err
} }

40
object/user_group.go
View File

@ -10,15 +10,15 @@ import (
) )
type UserGroupRelation struct { type UserGroupRelation struct {
UserId string `xorm:"varchar(100) notnull pk" json:"userId"` UserId string `xorm:"varchar(100) notnull pk" json:"userId"`
GroupId string `xorm:"varchar(100) notnull pk" json:"groupId"` GroupName string `xorm:"varchar(100) notnull pk" json:"groupName"`
CreatedTime string `xorm:"created" json:"createdTime"` CreatedTime string `xorm:"created" json:"createdTime"`
UpdatedTime string `xorm:"updated" json:"updatedTime"` UpdatedTime string `xorm:"updated" json:"updatedTime"`
} }
func updateUserGroupRelation(session *xorm.Session, user *User) (int64, error) { func updateUserGroupRelation(session *xorm.Session, user *User) (int64, error) {
physicalGroupCount, err := session.Where("type = ?", "Physical").In("id", user.Groups).Count(Group{}) physicalGroupCount, err := session.In("name", user.Groups).Count(Group{Type: "Physical"})
if err != nil { if err != nil {
return 0, err return 0, err
} }
@ -27,7 +27,7 @@ func updateUserGroupRelation(session *xorm.Session, user *User) (int64, error) {
} }
groups := []*Group{} groups := []*Group{}
err = session.In("id", user.Groups).Find(&groups) err = session.In("name", user.Groups).Find(&groups)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@ -42,7 +42,7 @@ func updateUserGroupRelation(session *xorm.Session, user *User) (int64, error) {
relations := []*UserGroupRelation{} relations := []*UserGroupRelation{}
for _, group := range groups { for _, group := range groups {
relations = append(relations, &UserGroupRelation{UserId: user.Id, GroupId: group.Id}) relations = append(relations, &UserGroupRelation{UserId: user.Id, GroupName: group.Name})
} }
if len(relations) == 0 { if len(relations) == 0 {
return 1, nil return 1, nil
@ -76,35 +76,35 @@ func RemoveUserFromGroup(owner, name, groupId string) (bool, error) {
return true, nil return true, nil
} }
func deleteUserGroupRelation(session *xorm.Session, userId, groupId string) (int64, error) { func DeleteUserGroupRelation(userId, groupId string) (int64, error) {
affected, err := session.ID(core.PK{userId, groupId}).Delete(&UserGroupRelation{}) affected, err := adapter.Engine.ID(core.PK{userId, groupId}).Delete(&UserGroupRelation{})
return affected, err return affected, err
} }
func deleteRelationByUser(id string) (int64, error) { func DeleteRelationByUserId(id string) (int64, error) {
affected, err := adapter.Engine.Delete(&UserGroupRelation{UserId: id}) affected, err := adapter.Engine.Delete(&UserGroupRelation{UserId: id})
return affected, err return affected, err
} }
func GetGroupUserCount(id string, field, value string) (int64, error) { func GetGroupUserCount(groupName string, field, value string) (int64, error) {
group, err := GetGroup(id) group, err := getGroupByName(groupName)
if group == nil || err != nil { if group == nil || err != nil {
return 0, err return 0, err
} }
if field == "" && value == "" { if field == "" && value == "" {
return adapter.Engine.Count(UserGroupRelation{GroupId: group.Id}) return adapter.Engine.Count(UserGroupRelation{GroupName: group.Name})
} else { } else {
return adapter.Engine.Table("user"). return adapter.Engine.Table("user").
Join("INNER", []string{"user_group_relation", "r"}, "user.id = r.user_id"). Join("INNER", []string{"user_group_relation", "r"}, "user.id = r.user_id").
Where("r.group_id = ?", group.Id). Where("r.group_name = ?", group.Name).
And(fmt.Sprintf("user.%s LIKE ?", util.CamelToSnakeCase(field)), "%"+value+"%"). And(fmt.Sprintf("user.%s LIKE ?", util.CamelToSnakeCase(field)), "%"+value+"%").
Count() Count()
} }
} }
func GetPaginationGroupUsers(id string, offset, limit int, field, value, sortField, sortOrder string) ([]*User, error) { func GetPaginationGroupUsers(groupName string, offset, limit int, field, value, sortField, sortOrder string) ([]*User, error) {
group, err := GetGroup(id) group, err := getGroupByName(groupName)
if group == nil || err != nil { if group == nil || err != nil {
return nil, err return nil, err
} }
@ -112,7 +112,7 @@ func GetPaginationGroupUsers(id string, offset, limit int, field, value, sortFie
users := []*User{} users := []*User{}
session := adapter.Engine.Table("user"). session := adapter.Engine.Table("user").
Join("INNER", []string{"user_group_relation", "r"}, "user.id = r.user_id"). Join("INNER", []string{"user_group_relation", "r"}, "user.id = r.user_id").
Where("r.group_id = ?", group.Id) Where("r.group_name = ?", group.Name)
if offset != -1 && limit != -1 { if offset != -1 && limit != -1 {
session.Limit(limit, offset) session.Limit(limit, offset)
@ -139,16 +139,16 @@ func GetPaginationGroupUsers(id string, offset, limit int, field, value, sortFie
return users, nil return users, nil
} }
func GetGroupUsers(id string) ([]*User, error) { func GetGroupUsers(groupName string) ([]*User, error) {
group, err := GetGroup(id) group, err := getGroupByName(groupName)
if group == nil || err != nil { if group == nil || err != nil {
return []*User{}, err return []*User{}, err
} }
users := []*User{} users := []*User{}
err = adapter.Engine.Table("user_group_relation").Join("INNER", []string{"user", "u"}, "user_group_relation.user_id = u.id"). err = adapter.Engine.Table("user").
Where("user_group_relation.group_id = ?", group.Id). Join("INNER", []string{"user_group_relation", "r"}, "user.id = r.user_id").
Find(&users) Where("r.group_name = ?", group.Name).Find(&users)
if err != nil { if err != nil {
return nil, err return nil, err
} }

13
web/src/GroupEdit.js
View File

@ -44,11 +44,6 @@ class GroupEditPage extends React.Component {
GroupBackend.getGroup(this.state.organizationName, this.state.groupName) GroupBackend.getGroup(this.state.organizationName, this.state.groupName)
.then((res) => { .then((res) => {
if (res.status === "ok") { if (res.status === "ok") {
if (res.data === null) {
this.props.history.push("/404");
return;
}
this.setState({ this.setState({
group: res.data, group: res.data,
}); });
@ -96,12 +91,12 @@ class GroupEditPage extends React.Component {
} }
getParentIdOptions() { getParentIdOptions() {
const groups = this.state.groups.filter((group) => group.id !== this.state.group.id); const groups = this.state.groups.filter((group) => group.name !== this.state.group.name);
const organization = this.state.organizations.find((organization) => organization.name === this.state.group.owner); const organization = this.state.organizations.find((organization) => organization.name === this.state.group.owner);
if (organization !== undefined) { if (organization !== undefined) {
groups.push({id: organization.name, displayName: organization.displayName}); groups.push({name: organization.name, displayName: organization.displayName});
} }
return groups.map((group) => ({label: group.displayName, value: group.id})); return groups.map((group) => ({label: group.displayName, value: group.name}));
} }
renderGroup() { renderGroup() {
@ -136,7 +131,7 @@ class GroupEditPage extends React.Component {
{Setting.getLabel(i18next.t("general:Name"), i18next.t("general:Name - Tooltip"))} : {Setting.getLabel(i18next.t("general:Name"), i18next.t("general:Name - Tooltip"))} :
</Col> </Col>
<Col span={22} > <Col span={22} >
<Input value={this.state.group.name} onChange={e => { <Input disabled={true} value={this.state.group.name} onChange={e => {
this.updateGroupField("name", e.target.value); this.updateGroupField("name", e.target.value);
}} /> }} />
</Col> </Col>

2
web/src/GroupList.js
View File

@ -185,7 +185,7 @@ class GroupListPage extends BaseListPage {
{record.parentId} {record.parentId}
</Link>; </Link>;
} }
const parentGroup = this.state.groups.find((group) => group.id === text); const parentGroup = this.state.groups.find((group) => group.name === text);
if (parentGroup === undefined) { if (parentGroup === undefined) {
return ""; return "";
} }

25
web/src/GroupTreePage.js
View File

@ -30,7 +30,6 @@ class GroupTreePage extends React.Component {
owner: Setting.isAdminUser(this.props.account) ? "" : this.props.account.owner, owner: Setting.isAdminUser(this.props.account) ? "" : this.props.account.owner,
organizationName: props.organizationName !== undefined ? props.organizationName : props.match.params.organizationName, organizationName: props.organizationName !== undefined ? props.organizationName : props.match.params.organizationName,
groupName: this.props.match?.params.groupName, groupName: this.props.match?.params.groupName,
groupId: undefined,
treeData: [], treeData: [],
selectedKeys: [this.props.match?.params.groupName], selectedKeys: [this.props.match?.params.groupName],
}; };
@ -55,7 +54,6 @@ class GroupTreePage extends React.Component {
if (res.status === "ok") { if (res.status === "ok") {
this.setState({ this.setState({
treeData: res.data, treeData: res.data,
groupId: this.findNodeId({children: res.data}, this.state.groupName),
}); });
} else { } else {
Setting.showMessage("error", res.msg); Setting.showMessage("error", res.msg);
@ -63,26 +61,10 @@ class GroupTreePage extends React.Component {
}); });
} }
findNodeId(node, targetName) {
if (node.key === targetName) {
return node.id;
}
if (node.children) {
for (let i = 0; i < node.children.length; i++) {
const result = this.findNodeId(node.children[i], targetName);
if (result) {
return result;
}
}
}
return null;
}
setTreeTitle(treeData) { setTreeTitle(treeData) {
const haveChildren = Array.isArray(treeData.children) && treeData.children.length > 0; const haveChildren = Array.isArray(treeData.children) && treeData.children.length > 0;
const isSelected = this.state.groupName === treeData.key; const isSelected = this.state.groupName === treeData.key;
return { return {
id: treeData.id,
key: treeData.key, key: treeData.key,
title: <Space> title: <Space>
{treeData.type === "Physical" ? <UsergroupAddOutlined /> : <HolderOutlined />} {treeData.type === "Physical" ? <UsergroupAddOutlined /> : <HolderOutlined />}
@ -201,7 +183,6 @@ class GroupTreePage extends React.Component {
this.setState({ this.setState({
selectedKeys: selectedKeys, selectedKeys: selectedKeys,
groupName: info.node.key, groupName: info.node.key,
groupId: info.node.id,
}); });
this.props.history.push(`/trees/${this.state.organizationName}/${info.node.key}`); this.props.history.push(`/trees/${this.state.organizationName}/${info.node.key}`);
}; };
@ -257,7 +238,7 @@ class GroupTreePage extends React.Component {
updatedTime: moment().format(), updatedTime: moment().format(),
displayName: `New Group - ${randomName}`, displayName: `New Group - ${randomName}`,
type: "Virtual", type: "Virtual",
parentId: isRoot ? this.state.organizationName : this.state.groupId, parentId: isRoot ? this.state.organizationName : this.state.groupName,
isTopGroup: isRoot, isTopGroup: isRoot,
isEnabled: true, isEnabled: true,
}; };
@ -300,8 +281,7 @@ class GroupTreePage extends React.Component {
onClick={() => { onClick={() => {
this.setState({ this.setState({
selectedKeys: [], selectedKeys: [],
groupName: null, groupName: undefined,
groupId: undefined,
}); });
this.props.history.push(`/trees/${this.state.organizationName}`); this.props.history.push(`/trees/${this.state.organizationName}`);
}} }}
@ -323,7 +303,6 @@ class GroupTreePage extends React.Component {
<UserListPage <UserListPage
organizationName={this.state.organizationName} organizationName={this.state.organizationName}
groupName={this.state.groupName} groupName={this.state.groupName}
groupId={this.state.groupId}
{...this.props} {...this.props}
/> />
</Col> </Col>

4
web/src/UserEditPage.js
View File

@ -309,7 +309,7 @@ class UserEditPage extends React.Component {
</Col> </Col>
<Col span={22} > <Col span={22} >
<Select virtual={false} mode="multiple" style={{width: "100%"}} disabled={disabled} value={this.state.user.groups ?? []} onChange={(value => { <Select virtual={false} mode="multiple" style={{width: "100%"}} disabled={disabled} value={this.state.user.groups ?? []} onChange={(value => {
if (this.state.groups?.filter(group => value.includes(group.id)) if (this.state.groups?.filter(group => value.includes(group.name))
.filter(group => group.type === "Physical").length > 1) { .filter(group => group.type === "Physical").length > 1) {
Setting.showMessage("error", i18next.t("general:You can only select one physical group")); Setting.showMessage("error", i18next.t("general:You can only select one physical group"));
return; return;
@ -319,7 +319,7 @@ class UserEditPage extends React.Component {
})} })}
> >
{ {
this.state.groups?.map((group) => <Option key={group.id} value={group.id}> this.state.groups?.map((group) => <Option key={group.name} value={group.name}>
<Space> <Space>
{group.type === "Physical" ? <UsergroupAddOutlined /> : <HolderOutlined />} {group.type === "Physical" ? <UsergroupAddOutlined /> : <HolderOutlined />}
{group.displayName} {group.displayName}

10
web/src/UserListPage.js
View File

@ -75,7 +75,7 @@ class UserListPage extends BaseListPage {
phone: Setting.getRandomNumber(), phone: Setting.getRandomNumber(),
countryCode: this.state.organization.countryCodes?.length > 0 ? this.state.organization.countryCodes[0] : "", countryCode: this.state.organization.countryCodes?.length > 0 ? this.state.organization.countryCodes[0] : "",
address: [], address: [],
groups: this.props.groupId ? [this.props.groupId] : [], groups: this.props.groupName ? [this.props.groupName] : [],
affiliation: "Example Inc.", affiliation: "Example Inc.",
tag: "staff", tag: "staff",
region: "", region: "",
@ -126,8 +126,8 @@ class UserListPage extends BaseListPage {
removeUserFromGroup(i) { removeUserFromGroup(i) {
const user = this.state.data[i]; const user = this.state.data[i];
const group = this.props.groupId; const group = this.props.groupName;
UserBackend.removeUserFromGroup({groupId: group, owner: user.owner, name: user.name}) UserBackend.removeUserFromGroup({groupName: group, owner: user.owner, name: user.name})
.then((res) => { .then((res) => {
if (res.status === "ok") { if (res.status === "ok") {
Setting.showMessage("success", i18next.t("general:Successfully removed")); Setting.showMessage("success", i18next.t("general:Successfully removed"));
@ -396,7 +396,7 @@ class UserListPage extends BaseListPage {
width: "190px", width: "190px",
fixed: (Setting.isMobile()) ? "false" : "right", fixed: (Setting.isMobile()) ? "false" : "right",
render: (text, record, index) => { render: (text, record, index) => {
const isTreePage = this.props.groupId !== undefined; const isTreePage = this.props.groupName !== undefined;
const disabled = (record.owner === this.props.account.owner && record.name === this.props.account.name) || (record.owner === "built-in" && record.name === "admin"); const disabled = (record.owner === this.props.account.owner && record.name === this.props.account.name) || (record.owner === "built-in" && record.name === "admin");
return ( return (
<Space> <Space>
@ -483,7 +483,7 @@ class UserListPage extends BaseListPage {
}); });
} else { } else {
(this.props.groupName ? (this.props.groupName ?
UserBackend.getUsers(this.state.organizationName, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder, `${this.state.organizationName}/${this.props.groupName}`) : UserBackend.getUsers(this.state.organizationName, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder, this.props.groupName) :
UserBackend.getUsers(this.state.organizationName, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)) UserBackend.getUsers(this.state.organizationName, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder))
.then((res) => { .then((res) => {
this.setState({ this.setState({

8
web/src/backend/UserBackend.js
View File

@ -25,8 +25,8 @@ export function getGlobalUsers(page, pageSize, field = "", value = "", sortField
}).then(res => res.json()); }).then(res => res.json());
} }
export function getUsers(owner, page = "", pageSize = "", field = "", value = "", sortField = "", sortOrder = "", groupId = "") { export function getUsers(owner, page = "", pageSize = "", field = "", value = "", sortField = "", sortOrder = "", groupName = "") {
return fetch(`${Setting.ServerUrl}/api/get-users?owner=${owner}&p=${page}&pageSize=${pageSize}&field=${field}&value=${value}&sortField=${sortField}&sortOrder=${sortOrder}&groupId=${groupId}`, { return fetch(`${Setting.ServerUrl}/api/get-users?owner=${owner}&p=${page}&pageSize=${pageSize}&field=${field}&value=${value}&sortField=${sortField}&sortOrder=${sortOrder}&groupName=${groupName}`, {
method: "GET", method: "GET",
credentials: "include", credentials: "include",
headers: { headers: {
@ -223,11 +223,11 @@ export function checkUserPassword(values) {
}).then(res => res.json()); }).then(res => res.json());
} }
export function removeUserFromGroup({owner, name, groupId}) { export function removeUserFromGroup({owner, name, groupName}) {
const formData = new FormData(); const formData = new FormData();
formData.append("owner", owner); formData.append("owner", owner);
formData.append("name", name); formData.append("name", name);
formData.append("groupId", groupId); formData.append("groupName", groupName);
return fetch(`${Setting.ServerUrl}/api/remove-user-from-group`, { return fetch(`${Setting.ServerUrl}/api/remove-user-from-group`, {
method: "POST", method: "POST",
credentials: "include", credentials: "include",