Skip to content

RemoveAdminOrOwner remove the user not the selected admin/owner #186

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.

Sign up for GitHub

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

Open
tizard34 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

RemoveAdminOrOwner remove the user not the selected admin/owner #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 9 additions & 7 deletions core/src/main/java/com/confighub/core/store/Store.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,15 +451,16 @@ public Organization update( final Organization organization,


public Organization removeOwner( final Organization organization,
final UserAccount user,
final UserAccount owner )
throws ConfigException
{
if ( Utils.anyNull( organization, owner ) )
if ( Utils.anyNull( organization, user, owner ) )
{
throw new ConfigException( Error.Code.MISSING_PARAMS );
}

if ( !organization.isOwner( owner ) )
if ( !organization.isOwner( user ) )
{
throw new ConfigException( Error.Code.USER_ACCESS_DENIED );
}
Expand All @@ -472,20 +473,21 @@ public Organization removeOwner( final Organization organization,


public Organization removeAdministrator( final Organization organization,
final UserAccount owner )
throws ConfigException
final UserAccount user,
final UserAccount administrator )
throws ConfigException
{
if ( Utils.anyNull( organization, owner ) )
if ( Utils.anyNull( organization, user, administrator ) )
{
throw new ConfigException( Error.Code.MISSING_PARAMS );
}

if ( !organization.isOwner( owner ) )
if ( !organization.isOwner( user ) )
{
throw new ConfigException( Error.Code.USER_ACCESS_DENIED );
}

organization.removeAdministrator( owner );
organization.removeAdministrator( administrator );

saveOrUpdateNonAudited( organization );
return organization;
Expand Down
12 changes: 6 additions & 6 deletions rest/src/main/java/com/confighub/api/org/RemoveAdminOrOwner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ public Response update(@PathParam("orgAccName") String orgAccName,

try
{
UserAccount userAccount = store.getUserByUsername(userAccountName);
if (null == userAccount)
UserAccount adminOrOwnerUserAccount = store.getUserByUsername(userAccountName);
if (null == adminOrOwnerUserAccount)
{
json.addProperty("success", true);
return Response.ok(gson.toJson(json), MediaType.APPLICATION_JSON).build();
Expand All @@ -62,17 +62,17 @@ public Response update(@PathParam("orgAccName") String orgAccName,
int status = validate(orgAccName, token, store);
if (0 != status) return Response.status(status).build();

if (!organization.isOwnerOrAdmin(userAccount))
if (!organization.isOwnerOrAdmin(adminOrOwnerUserAccount))
{
json.addProperty("success", true);
return Response.ok(gson.toJson(json), MediaType.APPLICATION_JSON).build();
}

store.begin();
if (organization.isOwner(userAccount))
store.removeOwner(organization, user);
if (organization.isOwner(adminOrOwnerUserAccount))
store.removeOwner(organization, user, adminOrOwnerUserAccount);
else
store.removeAdministrator(organization, user);
store.removeAdministrator(organization, user, adminOrOwnerUserAccount);
store.commit();

json.addProperty("success", true);
Expand Down