diff --git a/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/AbstractUserCommand.java b/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/AbstractUserCommand.java index 489535718163b7b338dc007b170bdf181fa5c607..cbae5fecb46a700651ca53842250af4ff6932c99 100644 --- a/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/AbstractUserCommand.java +++ b/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/AbstractUserCommand.java @@ -71,9 +71,12 @@ package ca.nrc.cadc.ac.admin; import java.security.AccessControlException; import java.security.Principal; +import java.util.Set; import org.apache.log4j.Logger; +import ca.nrc.cadc.ac.PersonalDetails; +import ca.nrc.cadc.ac.User; import ca.nrc.cadc.ac.UserNotFoundException; import ca.nrc.cadc.auth.HttpPrincipal; import ca.nrc.cadc.net.TransientException; @@ -117,4 +120,27 @@ public abstract class AbstractUserCommand extends AbstractCommand this.systemOut.println(msg); } } + + protected void printUser(final User<Principal> user) + { + if (user != null) + { + // print all user identities + this.systemOut.println("Identitities"); + Set<Principal> principals = user.getIdentities(); + for (final Principal p : principals) + { + this.systemOut.println(p.toString()); + } + + this.systemOut.println(); + + // print user's personal details + PersonalDetails personalDetails = user.getUserDetail(PersonalDetails.class); + if (personalDetails != null) + { + this.systemOut.println(personalDetails.toStringFormatted()); + } + } + } } diff --git a/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ApproveUser.java b/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ApproveUser.java index 145ed9852925d5227bcea264b7c5f5bffe1c4099..b58fa4da240eefa8575606489d28cbd71e8bedaa 100644 --- a/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ApproveUser.java +++ b/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ApproveUser.java @@ -70,9 +70,11 @@ package ca.nrc.cadc.ac.admin; import java.security.AccessControlException; +import java.security.Principal; import org.apache.log4j.Logger; +import ca.nrc.cadc.ac.User; import ca.nrc.cadc.ac.UserNotFoundException; import ca.nrc.cadc.net.TransientException; @@ -98,8 +100,9 @@ public class ApproveUser extends AbstractUserCommand protected void execute() throws AccessControlException, UserNotFoundException, TransientException { - this.getUserPersistence().approvePendingUser(this.getPrincipal()); + User<Principal> user = this.getUserPersistence().approvePendingUser(this.getPrincipal()); String msg = "User " + this.getPrincipal().getName() + " was approved successfully."; this.systemOut.println(msg); + this.printUser(user); } } diff --git a/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ViewUser.java b/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ViewUser.java index 69442f6d1ea7097d67a1eb56eb082eedd0d0a05c..5ebe03288c13b1405591cb3d75efe542070328e6 100644 --- a/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ViewUser.java +++ b/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ViewUser.java @@ -71,11 +71,9 @@ package ca.nrc.cadc.ac.admin; import java.security.AccessControlException; import java.security.Principal; -import java.util.Set; import org.apache.log4j.Logger; -import ca.nrc.cadc.ac.PersonalDetails; import ca.nrc.cadc.ac.User; import ca.nrc.cadc.ac.UserNotFoundException; import ca.nrc.cadc.net.TransientException; @@ -114,27 +112,4 @@ public class ViewUser extends AbstractUserCommand this.printUser(user); } } - - protected void printUser(final User<Principal> user) - { - if (user != null) - { - // print all user identities - this.systemOut.println("Identitities"); - Set<Principal> principals = user.getIdentities(); - for (final Principal p : principals) - { - this.systemOut.println(p.toString()); - } - - this.systemOut.println(); - - // print user's personal details - PersonalDetails personalDetails = user.getUserDetail(PersonalDetails.class); - if (personalDetails != null) - { - this.systemOut.println(personalDetails.toStringFormatted()); - } - } - } }