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

[Rest-server] Fix admin can't submit job to newly added VC #1972

Merged
merged 2 commits into from
Jan 5, 2019
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/src/models/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,10 @@ const checkUserVc = (username, virtualCluster, next) => {
if (err) {
return next(err);
}
// Admin user can have right to all virtual cluster
if (res[0]['admin'] === 'true') {
return next(null, true);
}
let userVirtualClusters = res[0]['virtualCluster'].trim().split(',');
for (let item of userVirtualClusters) {
if (item === virtualCluster) {
Expand Down
2 changes: 1 addition & 1 deletion src/rest-server/test/jobSubmission.js
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ describe('Submit job: POST /api/v1/user/:username/jobs', () => {
'name': '7573657231',
},
'data': {
'admin': 'dHJ1ZQ==',
'admin': 'ZmFsc2U=',
'password': 'MzFhNzQ0YzNhZjg5MDU2MDI0ZmY2MmMzNTZmNTQ3ZGRjMzUzYWQ3MjdkMzEwYTc3MzcxODgxMjk4MmQ1YzZlZmMzYmZmNzBkYjVlMTA0M2JkMjFkMmVkYzg4M2M4Y2Q0ZjllNzRhMWU1MjA1NDMzNjQ5MzYxMTQ4YmE4OTY0MzQ=',
'username': 'dXNlcjE=',
'virtualCluster': 'ZGVmYXVsdCx2YzE='
Expand Down