-
Notifications
You must be signed in to change notification settings - Fork 8
check project owner is not removed #566
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
85bcd13
check project owner is not removed
rsiminel 68d182e
can not delete user that is project owner
rsiminel a5cae30
typo
rsiminel 2006204
can not delete last project member account
rsiminel abe4f7a
typo
rsiminel 6daf77a
fixes + changelog
rsiminel 09e0e4e
Merge branch 'master' into remove-project-owner
rsiminel 62b7588
pretty error message
rsiminel 17f9bcd
Merge branch 'master' into remove-project-owner
rsiminel 319711c
Merge branch 'master' into remove-project-owner
mboudet File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -536,6 +536,19 @@ router.delete('/user/:id', async function(req, res) { | |
res.status(403).send({ message: 'User owns some web sites, please change owner first!' }); | ||
return; | ||
} | ||
let projects = await dbsrv.mongo_projects().find({ owner: uid }).toArray(); | ||
if (projects && projects.length > 0) { | ||
res.status(403).send({ message: 'User owns some projects, please change owner first!' }); | ||
return; | ||
} | ||
const allprojects = user.projects ? user.projects : []; | ||
for (let project_name of allprojects) { | ||
const users_in_project = await dbsrv.mongo_users().find({ 'projects': project_name }).toArray(); | ||
if (users_in_project.length <= 1) { | ||
res.status(403).send({ message: 'User is the last member of project ${project_name}' }); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Might be better to store project names somewhere, and send the response after will all projects. |
||
return; | ||
} | ||
} | ||
usrsrv.delete_user(user, session_user.uid, mail_message, mail_send).then(function() { | ||
res.send({ message: 'User deleted' }); | ||
return; | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Might be better to use .count() instead of toArray, and just check the count value after
dbsrv.mongo_users().find({ 'projects': project_name }).count()
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(Need to check if it works. It works in mongo directly, but well..)