Skip to content
This repository has been archived by the owner on Jun 6, 2024. It is now read-only.

fix updateGroupUserList api issue #5121

Merged
merged 3 commits into from
Nov 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/rest-server/docs/swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -725,6 +725,8 @@ paths:
description: description
externalName: externalName
extension: {}
"401":
$ref: "#/components/responses/UnauthorizedUserError"
"500":
$ref: "#/components/responses/UnknownError"
post:
Expand Down Expand Up @@ -930,6 +932,8 @@ paths:
clusterAdmin: false
"401":
$ref: "#/components/responses/UnauthorizedUserError"
"403":
$ref: "#/components/responses/ForbiddenUserError"
"500":
$ref: "#/components/responses/UnknownError"
/api/v2/virtual-clusters:
Expand Down
18 changes: 12 additions & 6 deletions src/rest-server/src/controllers/v2/group.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ const getGroup = async (req, res, next) => {
),
);
}
return next(createError.unknown(error));
const message = error.data ? error.data.reason : error;
return next(createError.unknown(message));
}
};

Expand All @@ -45,7 +46,8 @@ const getAllGroup = async (req, res, next) => {
const groupList = await groupModel.getAllGroup();
return res.status(200).json(groupList);
} catch (error) {
return next(createError.unknown(error));
const message = error.data ? error.data.reason : error;
return next(createError.unknown(message));
}
};

Expand All @@ -64,7 +66,8 @@ const getGroupUserList = async (req, res, next) => {
}
return res.status(200).json(userlist);
} catch (error) {
return next(createError.unknown(error));
const message = error.data ? error.data.reason : error;
return next(createError.unknown(message));
}
};

Expand All @@ -82,7 +85,8 @@ const createGroup = async (req, res, next) => {
message: 'group is created successfully',
});
} catch (error) {
return next(createError.unknown(error));
const message = error.data ? error.data.reason : error;
return next(createError.unknown(message));
}
};

Expand Down Expand Up @@ -123,7 +127,8 @@ const updateGroup = async (req, res, next) => {
),
);
}
return next(createError.unknown(error));
const message = error.data ? error.data.reason : error;
return next(createError.unknown(message));
}
};

Expand All @@ -135,7 +140,8 @@ const deleteGroup = async (req, res, next) => {
message: 'group is removed successfully',
});
} catch (error) {
return next(createError.unknown(error));
const message = error.data ? error.data.reason : error;
return next(createError.unknown(message));
}
};

Expand Down
2 changes: 1 addition & 1 deletion src/rest-server/src/controllers/v2/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ const updateUserGroupList = async (req, res, next) => {
let userValue;
try {
userValue = await userModel.getUser(username);
userValue.grouplist = await updateGroupListInternal(userValue.grouplist);
userValue.grouplist = await updateGroupListInternal(req.body.grouplist);
} catch (error) {
if (error.code === 'NoGroupError') {
return next(error);
Expand Down